From 09035be81ec20946e479a8883f2f17118de383bb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 13 Apr 2016 21:48:06 +0100 Subject: [PATCH] fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers Bug-Debian: https://bugs.debian.org/819725 Forwarded: https://lore.kernel.org/all/20160517133631.GF7555@decadent.org.uk/ This helps initramfs builders and other tools to find the full dependencies of a module. Signed-off-by: Ben Hutchings [Lukas Wunner: Forward-ported to 4.11: drop parts applied upstream] Gbp-Pq: Topic bugfix/all Gbp-Pq: Name fs-add-module_softdep-declarations-for-hard-coded-cr.patch --- fs/btrfs/super.c | 2 +- fs/ext4/super.c | 2 +- fs/jbd2/journal.c | 1 + fs/nfsd/nfsctl.c | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index d1ec446188d..ef3b0927987 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -2638,7 +2638,7 @@ module_exit(exit_btrfs_fs) MODULE_DESCRIPTION("B-Tree File System (BTRFS)"); MODULE_LICENSE("GPL"); -MODULE_SOFTDEP("pre: crc32c"); +MODULE_SOFTDEP("pre: crypto-crc32c"); MODULE_SOFTDEP("pre: xxhash64"); MODULE_SOFTDEP("pre: sha256"); MODULE_SOFTDEP("pre: blake2b-256"); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index cd3328b0315..f8f60c33088 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -7435,6 +7435,6 @@ static void __exit ext4_exit_fs(void) MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Fourth Extended Filesystem"); MODULE_LICENSE("GPL"); -MODULE_SOFTDEP("pre: crc32c"); +MODULE_SOFTDEP("pre: crypto-crc32c"); module_init(ext4_init_fs) module_exit(ext4_exit_fs) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 33a975193f1..731219e3074 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -3194,6 +3194,7 @@ static void __exit journal_exit(void) MODULE_DESCRIPTION("Generic filesystem journal-writing module"); MODULE_LICENSE("GPL"); +MODULE_SOFTDEP("pre: crypto-crc32c"); module_init(journal_init); module_exit(journal_exit); diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index e8704a4e848..5b42c5fcaf5 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -2352,5 +2352,8 @@ static void __exit exit_nfsd(void) MODULE_AUTHOR("Olaf Kirch "); MODULE_DESCRIPTION("In-kernel NFS server"); MODULE_LICENSE("GPL"); +#ifdef CONFIG_NFSD_V4 +MODULE_SOFTDEP("pre: crypto-md5"); +#endif module_init(init_nfsd) module_exit(exit_nfsd) -- 2.30.2